Auto merge of #3898 - jmatraszek:fix_rust_40955, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 5 Apr 2017 23:36:04 +0000 (23:36 +0000)
committerbors <bors@rust-lang.org>
Wed, 5 Apr 2017 23:36:04 +0000 (23:36 +0000)
commitc416fb60b11ecfd2a1ba0fb8567c9a92590b5d28
tree43ed6578a33a893eaf1edd85d7a6e5491a45772b
parentf5348cc321a032db95cd18e3129a4392d2e0a892
parent2c9184d047b79ea772571e1540ef0aa0fb44ab91
Auto merge of #3898 - jmatraszek:fix_rust_40955, r=alexcrichton

Fix rust-lang/rust 40955

Proposed fix for rust-lang/rust#40955.

I could also work on adding some additional tests, so we have all cases covered and automatically tested.